From 224c47a9b82e657025f4e3e64f44c5fa67c3eded Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 1 Feb 2005 23:55:44 +0000 Subject: [PATCH] Merged from gtk-2-6: 2005-02-01 Federico Mena Quintero Merged from gtk-2-6: Fix #165770: * gtk/gtkfilechooserdefault.c (FALLBACK_ICON_SIZE): Make the fallback size be 16, to be equal to the default for GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()). (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of GTK_ICON_SIZE_SMALL_TOOLBAR. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ gtk/gtkfilechooserdefault.c | 4 ++-- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c32a00e651..260284db9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-02-01 Federico Mena Quintero + + Merged from gtk-2-6: + + Fix #165770: + + * gtk/gtkfilechooserdefault.c (FALLBACK_ICON_SIZE): Make the + fallback size be 16, to be equal to the default for + GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()). + (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of + GTK_ICON_SIZE_SMALL_TOOLBAR. + 2005-02-01 Matthias Clasen * */*.c: Fix many instances of "the the" in docs and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c32a00e651..260284db9d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +2005-02-01 Federico Mena Quintero + + Merged from gtk-2-6: + + Fix #165770: + + * gtk/gtkfilechooserdefault.c (FALLBACK_ICON_SIZE): Make the + fallback size be 16, to be equal to the default for + GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()). + (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of + GTK_ICON_SIZE_SMALL_TOOLBAR. + 2005-02-01 Matthias Clasen * */*.c: Fix many instances of "the the" in docs and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c32a00e651..260284db9d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +2005-02-01 Federico Mena Quintero + + Merged from gtk-2-6: + + Fix #165770: + + * gtk/gtkfilechooserdefault.c (FALLBACK_ICON_SIZE): Make the + fallback size be 16, to be equal to the default for + GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()). + (change_icon_theme): Use GTK_ICON_SIZE_MENU instead of + GTK_ICON_SIZE_SMALL_TOOLBAR. + 2005-02-01 Matthias Clasen * */*.c: Fix many instances of "the the" in docs and diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 77a14c4c13..e55998dc9e 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -273,7 +273,7 @@ typedef enum { } ShortcutsIndex; /* Icon size for if we can't get it from the theme */ -#define FALLBACK_ICON_SIZE 20 +#define FALLBACK_ICON_SIZE 16 #define PREVIEW_HBOX_SPACING 12 #define NUM_LINES 40 @@ -4061,7 +4061,7 @@ change_icon_theme (GtkFileChooserDefault *impl) settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl))); - if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_SMALL_TOOLBAR, &width, &height)) + if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &width, &height)) impl->icon_size = MAX (width, height); else impl->icon_size = FALLBACK_ICON_SIZE; -- 2.30.2